(smerge-match-conflict): Fix last change.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:46:54 +0000 (20:46 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 15 Apr 2004 20:46:54 +0000 (20:46 +0000)
commitcca16940be2c22df4652f222c7d4ac6c74885db2
tree8ed4e38e720dd5bfe703a56f52c7ed1334287825
parentb8f9cbf275dbc548abe3615ea81f59578dc1e39e
(smerge-match-conflict): Fix last change.
lisp/smerge-mode.el